From 43a5781f714769a62403c8c0abab1e279860977a Mon Sep 17 00:00:00 2001 From: "kaf24@freefall.cl.cam.ac.uk" Date: Sat, 23 Oct 2004 17:50:05 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.268 (417a99cddcYDzBoICm2bmzocJ2wt4A) Remove all the XENVERSION/EXTRAVERSION stuff after all. Patch root Linux Makefile from repository master Makefile. --- Makefile | 32 ++++++++++++++-------- linux-2.4.27-xen-sparse/arch/xen/Makefile | 3 -- linux-2.6.8.1-xen-sparse/arch/xen/Makefile | 3 -- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index e1b40cc89b..3147e518d8 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,12 @@ mk-linux-trees: patches/ebtables.diff pristine-linux-src ./mkbuildtree ../linux-$(LINUX_VER)-xen0 ) cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU ( cd linux-$(LINUX_VER)-xen0 ; \ - patch -p1 -F3 < ../patches/ebtables.diff ) + patch -p1 -F3 < ../patches/ebtables.diff ; \ + sed -e 's/^EXTRAVERSION.*/&-xen0/' Makefile >Mk.tmp ; \ + rm -f Makefile ; mv Mk.tmp Makefile ) + ( cd linux-$(LINUX_VER)-xenU ; \ + sed -e 's/^EXTRAVERSION.*/&-xenU/' Makefile >Mk.tmp ; \ + rm -f Makefile ; mv Mk.tmp Makefile ) else mk-linux-trees: pristine-linux-src $(RM) -rf $(LINUX_TREES) @@ -74,35 +79,40 @@ mk-linux-trees: pristine-linux-src ( cd linux-$(LINUX_VER)-xen-sparse ; \ ./mkbuildtree ../linux-$(LINUX_VER)-xen0 ) cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU + ( cd linux-$(LINUX_VER)-xen0 ; \ + sed -e 's/^EXTRAVERSION.*/&-xen0/' Makefile >Mk.tmp ; \ + rm -f Makefile ; mv Mk.tmp Makefile ) + ( cd linux-$(LINUX_VER)-xenU ; \ + sed -e 's/^EXTRAVERSION.*/&-xenU/' Makefile >Mk.tmp ; \ + rm -f Makefile ; mv Mk.tmp Makefile ) endif # configure the specified linux tree CDIR = $(subst config-,linux-$(LINUX_VER)-,$@) ifeq ($(LINUX_RELEASE),2.4) config-xen%: - $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) mrproper + $(MAKE) -C $(CDIR) ARCH=xen mrproper cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)$(subst config,,$@) \ $(CDIR)/.config || \ - $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) $(subst config-,,$@)_config - $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) oldconfig - $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) dep + $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_config + $(MAKE) -C $(CDIR) ARCH=xen oldconfig + $(MAKE) -C $(CDIR) ARCH=xen dep else config-xen%: - $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) mrproper + $(MAKE) -C $(CDIR) ARCH=xen mrproper @[ -e $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) ] \ && cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \ $(CDIR)/.config || \ - $(MAKE) -C $(CDIR) ARCH=xen XENVERSION=$(subst config,,$@) $(subst config-,,$@)_defconfig + $(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_defconfig endif # build the specified linux tree BDIR = $(subst linux-,linux-$(LINUX_VER)-,$@) linux-xen%: - $(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) modules - $(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) INSTALL_MOD_PATH=$(INSTALL_DIR) \ + $(MAKE) -C $(BDIR) ARCH=xen modules + $(MAKE) -C $(BDIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) \ modules_install - $(MAKE) -C $(BDIR) ARCH=xen XENVERSION=$(subst linux,,$@) INSTALL_PATH=$(INSTALL_DIR) install - + $(MAKE) -C $(BDIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install NETBSD_RELEASE ?= 2.0 NETBSD_VER ?= $(shell ( /bin/ls -ld netbsd-$(NETBSD_RELEASE)*-xen-sparse ) 2>/dev/null | \ diff --git a/linux-2.4.27-xen-sparse/arch/xen/Makefile b/linux-2.4.27-xen-sparse/arch/xen/Makefile index 9bf5bc6bce..f8f1e96214 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/Makefile +++ b/linux-2.4.27-xen-sparse/arch/xen/Makefile @@ -16,9 +16,6 @@ # Added '-march' and '-mpreferred-stack-boundary' support # -XENVERSION ?= $(shell cat .extraversion 2>/dev/null || echo "-xen") -EXTRAVERSION := $(EXTRAVERSION)$(XENVERSION) - # If no .config file exists then use the appropriate defconfig-* file ifneq (.config,$(wildcard .config)) DUMMYX:=$(shell cp $(TOPDIR)/arch/xen/defconfig$(EXTRAVERSION) $(TOPDIR)/.config) diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/Makefile b/linux-2.6.8.1-xen-sparse/arch/xen/Makefile index 6577504ae0..224e0aa34f 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/Makefile +++ b/linux-2.6.8.1-xen-sparse/arch/xen/Makefile @@ -12,9 +12,6 @@ # Copyright (C) 2004 by Christian Limpach # -XENVERSION ?= $(shell cat .extraversion 2>/dev/null || echo "-xen") -EXTRAVERSION := $(EXTRAVERSION)$(XENVERSION) - XENARCH := $(subst ",,$(CONFIG_XENARCH)) # pick up headers from include/asm-xen/asm in preference over include/asm -- 2.30.2